From 5843db87a1a6ad2ba05a1ffca3b3df44d88caf5e Mon Sep 17 00:00:00 2001
From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Fri, 20 Sep 2002 17:08:13 +0000
Subject: [PATCH] Include full GPX schema header.   Derived from patch from
 Jochen.

---
 gpsbabel/gpx.c      | 11 +++++++++--
 gpsbabel/magproto.c |  8 ++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/gpsbabel/gpx.c b/gpsbabel/gpx.c
index 0f03c110d..152ff2194 100644
--- a/gpsbabel/gpx.c
+++ b/gpsbabel/gpx.c
@@ -234,10 +234,17 @@ gpx_waypt_pr(const waypoint *waypointp)
 void
 gpx_write(void)
 {
-	fprintf(ofd, "<?xml version=\"1.0\"?>\n");
-	fprintf(ofd, "<gpx\n\tversion=\"1.0\">\n");
 	setshort_length(32);
+
+	fprintf(ofd, "<?xml version=\"1.0\"?>\n");
+	fprintf(ofd, "<gpx\n version=\"1.0\"\n");
+	fprintf(ofd, "creator=\"GPSBabel - http://gpsbabel.sourceforge.net\"\n");
+	fprintf(ofd, "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n");
+	fprintf(ofd, "xmlns=\"http://www.topografix.com/GPX/1/0\"\n");
+	fprintf(ofd, "xsi:schemaLocation=\"http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd\">\n");
+
 	waypt_disp_all(gpx_waypt_pr);
+
 	fprintf(ofd, "</gpx>\n");
 }
 
diff --git a/gpsbabel/magproto.c b/gpsbabel/magproto.c
index c30b0174d..5ba1ff305 100644
--- a/gpsbabel/magproto.c
+++ b/gpsbabel/magproto.c
@@ -500,7 +500,7 @@ mag_rd_init(const char *portname)
 	
 	mag_handon();
 	now = time(NULL);
-	later = now + 2;
+	later = now + 3;
 	if (!is_file) {
 		mag_writemsg("PMGNCMD,VERSION");
 	}
@@ -770,7 +770,11 @@ mag_write(void)
 		mag_readmsg();
 		mag_readmsg();
 	}
-
+	/* 
+	 * Whitespace is actually legal, but since waypoint name length is
+	 * only 8 bytes, we'll conserve them.
+	 */
+	setshort_whitespace_ok(0);
 	waypt_disp_all(mag_waypt_pr);
 }
 
-- 
2.30.2